Merge "Power button press behavior now accounts for default display state" into sc-dev