Merge "Revert "Removing changes not meant for MR1"" into graphics-dev