Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518e
am: 7d453edf34

Change-Id: I32845dfaddb1bdfea68f0861c0d37b478d84a9e7