Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...