Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev