Merge "Changed some demo examples to use ImageView." into devel/master