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

Change-Id: I08d22529331d4f512935e94fd1c63525bdda6115