Merge "Possible NullPointerException in restorePanelState"

     */

    private void restorePanelState(SparseArray<Parcelable> icicles) {

        PanelFeatureState st;

        for (int curFeatureId = icicles.size() - 1; curFeatureId >= 0; curFeatureId--) {

        int curFeatureId;

        for (int i = icicles.size() - 1; i >= 0; i--) {

            curFeatureId = icicles.keyAt(i);

            st = getPanelState(curFeatureId, false /* required */);

            if (st == null) {

                // The panel must not have been required, and is currently not around, skip it