Merge "Ensure that rounded corner radius applies on activity launches" into main