Merge "Fix VideoView test case" into devel/master