Merge "Fix to get to Home after powerbutton test am: 8c755078 am: b528bba0" into nyc-mr1-dev-plus-aosp