Merge "Implement phase 1 of per-display power states"