Merge "Turn on rounded corners on PIP with a flag" into sc-dev