Merge "Add a new key_pressed_mutex" am: 33bb113af2
am: e99f4e88a2

Change-Id: I595e163e0cfc5c0247abe2eebc95dce32e154a63