Merge "PiP: Better rotation angle calculation." into sc-dev