Merge "Prevent NPE in OverviewProxyService's LauncherStateChangedReceiver" into main