Merge "composer: avoid handling pending power mode for disconnected displays"