Fix video widget display
Merge remote-tracking branch 'upstream/master' into archlinux_dev2

Conflicts:
	libs/thirdParty/libxbee