Merge "Revert "Adds ChooserPinMigration core startable"" into udc-dev