Merge "Disable Keyguard in OpenGL Tests" into jb-dev