Merge "Controls - Restart activity on rotation" into sc-dev