Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9...