Merge "Limit don't dispatch when non-interactive and the display is off to watches" into nyc-dev