Merge "Update recovery UI." into nyc-dev