Merge "Update RichContentReceiver API (now OnReceiveContentCallback)"