Merge "Update javadoc to deprecate non-compat version widgets"