Merge "Fixing crashloop where LauncherActivityInfo can be null during icon query." into tm-dev