Merge "Fixed / disabled CustomDeviceOwnerTest for headless system user." into sc-dev