Merge "Update onReceiveContent() logic for app vs platform processing"