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

Change-Id: Ibd79e04ee261f387a50ec702372ec802a4f69fdc