Merge "Using new APIs for disabling metaData table" into ub-launcher3-master