Merge "Align PIP menu after rotation" into sc-dev