Merge "Remove ExportedActivity check"