Merge "Turn OFF any changing displays during device-state transitions" into sc-dev