Merge "FakeDeviceProvisionedController: allow un-setting-up user" into main