Fixes vsync behavior in power mode transitions. am: 4de4ee3cb3 am: c6e23d9959
am: e051fd5b88  -s ours

Change-Id: Ie83a4a41d911d0fb4cfde1dd8cdff6031f6ee238