Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev