Merge "Change Layer's ReuseRenderers check only if we need" into devel/master