Merge "SurfaceFlinger: Handle multiple rounded corner settings" into sc-v2-dev