Merge "Migrate and remove account from calling user in headless mode" into udc-dev