Merge "Removing static instance of LauncherAppsCompat and unnecessary wrapper classes" into ub-launcher3-master