Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev

    android:layout_height="wrap_content">

    <TextView

        android:id="@+id/global_actions_change_message"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:visibility="gone"

        android:layout_height="wrap_content"

        android:text="@string/global_actions_change_description" />

    <ImageView