Merge "Take fixed rotation into account when setting the rounded corner frame" into main