Merge "Fix clearPackagePreferredActivities to check appid"