Merge "Fix tablet layout and resources." into klp-dev

        android:layout_weight="1"

        android:orientation="vertical">

        <FrameLayout

        <com.android.documentsui.DirectoryContainerView

            android:id="@+id/container_directory"

            android:layout_width="match_parent"

            android:layout_height="0dip"