Merge "Don't opt-out of warning dialog by default on user builds." into nyc-dev