Merge "Remove rotation based scaling" into sc-dev