Merge "Removed logic that sized the view before the shelf" into sc-dev