Merge "Fix setTranslation NPE when shelf icon is null" into main

            // In order to keep the shelf in sync with this swiping, we're simply translating

            // it's icon by the same amount. The translation is already being used for the normal

            // positioning, so we can use the scrollX instead.

            getShelfIcon().setScrollX((int) -translationX);

            StatusBarIconView shelfIcon = getShelfIcon();

            if (shelfIcon != null) {

                shelfIcon.setScrollX((int) -translationX);

            }

        }

        if (mMenuRow != null && mMenuRow.getMenuView() != null) {