Merge "SF could get stuck waiting for vsync when turning the screen off" into jb-dev