Merge "Improve javadoc for OnReceiveContentListener.onReceiveContent" into sc-dev