Merge "Fix a layout problem for pre-MR2"

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="5dip">

        android:layout_marginStart="5dip"

        android:layout_marginLeft="5dip">

      <TextView

          android:id="@+android:id/summary"