Merge "Avoid excessive KGSL maps" into rvc-dev