Merge "Limit behavior to default DisplayPowerController." into sc-dev