Merge "Support PiP with fixed rotation" into sc-dev