Merge "Update ChangeAppRotation test"