Merge "Fix misplaced UDFPS UI after rotation" into sc-v2-dev