Merge "Update autorotate search terms" into sc-dev