Merge "Do not show error dialogs on watch builds." into nyc-mr1-dev