Merge "Temporarily disable viewport caching in GL context" into devel/master