Merge "Catch NPE for AllAppsContainerView.dispatchRestoreInstanceState" into sc-dev