Merge "Stop copying Property::Maps in ImageView SetProperty" into devel/master