Merge "Prevent NPE inside AllAppsTransitionController" into sc-dev