Merge "Fixing wrong preference file name in LauncherFiles" into ub-launcher3-calgary