Merge "Fix for ItemView OVERSHOOT_SIZE" into devel/master