Merge "Fix heads up notification corner roundness" into sc-dev