Merge "Removing LauncherProvider dependency in DatabaseHeler" into ub-launcher3-calgary