Merge "Limit don\'t dispatch when non-interactive and the display is off to watches" into nyc-dev
am: 015e42ae
* commit '015e42ae':
Limit don't dispatch when non-interactive and the display is off to watches
Change-Id: Id8bd38d5e7fdba893cae3148d82f7fd6b9f5a47f