Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev