Merge "Fixing issue with larger clip bounds being specified than in the view." into nyc-dev