Merge "Use context user for canNotifyAsPackage"