Merge "Fix NPE for where intent.package is null but targetpkg is not." into main