Merge "Intruduce KeyCombinationManager to PhoneWindowManager"