Merge "Fixes / improvements on CtsSettingsDeviceOwnerApp." into sc-dev