Merge "Fix 3439835: NPE at com.android.launcher2.Launcher.bindAppsUpdated"