Merge "Fix b/5821633: Could not activate GLEnvironment" into jb-dev