Merge "Power button press behavior should account for default display state" into sc-dev