Merge "Docs: Emulator-related updates" into nyc-dev