Merge "Mark GrContext dirty after onContextDestroyed"