Merge "Scroll to remote input view" into nyc-dev