Merge "Update demo app for content insertion to save & display images" into sc-dev