Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev