Merge "Update demo app for the updated onReceiveContent() API"