Merge "Adding app op and intent action for external sources"