Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev