Merge "Group editor: Handle rotation correctly"