Merge "Make display mirroring for local displays configurable." into nyc-dev