Merge "Fix potential deadlock between LockScreen and WindowManagerService"