Merge "Tweaks to ViewOverlay." into nyc-dev