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

Change-Id: I0fba407c14811a81b1ad2926fca5130f8f65638d