Merge "Refactor to remove ControlRenderer::mCachedRenderer member." into devel/master