Merge "Fix GL memory not being removed from lost RAM"