Merge "Remove invalid javadoc link to VideoView" into sc-dev