Merge "Add factory reset intent to the settings app." into main