Merge "Fix Javadoc for View"