Merge "Check for null packages in setLockTaskPackages"