Merge "ImageView example code correction" into devel/master