Merge "Revert "Fix rounded corners in transitions on non-internal displays"" into main