Merge "Removed strong zoom as shade starts to be pulled" into sc-dev