Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev

* changes:
  Fixes a bug where the lockscreen would be frozen
  Allow home button to be tapped while a incoming call shows a HUN