Merge changes I423fc81d,I4b986404 into sc-dev

* changes:
  Bypass fixes for clock
  Backup POWER_BUTTON_LONG_PRESS