Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev