Merge "[Media] Demo app changes." into main