Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev