Merge "Rename surfaceflinger uclamp.min property"