Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #5427391"