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

* commit '244637b59c328b918c6b2e1aef33ba448728207d':
  work around bug in LauncherAppsCompat to find restored icons