am 99333315: Merge "Ensure we have a GL context before deleting View layers...
am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit '99333315':
Ensure we have a GL context before deleting View layers Bug #7391098