Merge "Fix incorrect icon placement on BP rotation" into main