Merge "Fixes vsync behavior in power mode transitions."