Merge "work around bug in LauncherAppsCompat to find restored icons" into ub-now-nova