Merge "Fix apps row align and update to new layout spec"

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="@dimen/apps_row_item_width"

    android:layout_height="@dimen/apps_row_item_height"

    android:layout_width="0dp"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:minWidth="@dimen/apps_row_item_width"

    android:minHeight="@dimen/apps_row_item_height"

    android:orientation="vertical"

    android:background="@drawable/generic_ripple_background"

    android:gravity="center">

    android:gravity="center_horizontal">

    <ImageView

        android:id="@+id/app_icon"

    <HorizontalScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fillViewport="true"

        android:scrollbars="none">

        <LinearLayout

            android:id="@+id/apps_group"