Merge "Remove Assistant corner handles" into sc-dev