Merge "Only auto create guests when device is provisioned" into sc-dev