Merge "Make isDeviceOwnerApp user aware" into main