Merge "Use task's userId to obtain PackageManager instance" into main