Merge "Fix VideoView to work in multi-window" into devel/master