Merge "Fix build; doc link in ImageView" into mnc-dev