Merge "Fix call to PackageManager exception" into udc-qpr-dev