Merge "Fix occasional tc failure of glView" into devel/master