Merge "Type-to-focus improvements." into nyc-dev