Merge "Fixed BackgroundActivityLaunchTest#testDeviceOwner" into sc-dev