Merge "A simple UI for Image + Text sharing" into tm-qpr-dev