Merge "Image inline reply" into sc-dev