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

Change-Id: I7d2d66a5b52820c2a6e6e7df9a4c29ac4ba2e5bc