Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev am: 52a11f7c
Fixes a bug where the lockscreen would be frozen am: 3127daf0
Allow home button to be tapped while a incoming call shows a HUN am: 64be772e