Merge changes I02362055,I8ab46fde

* changes:
  Fallback BUTTON_MODE to HOME
  Remap PS key to BUTTON_MODE