Merge "Revert "Correctly aging renderer uniformMap"" into devel/master