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

Change-Id: I50d56807c994ea1db287bfe31fc53fc4d74614e7