Merge "Fix NPE when calling setUpdateListener(null)" into mnc-ub-dev