Merge branch 'master' into branding

            <ImageView

                android:id="@+id/noteFavorite"

                android:contentDescription="@string/menu_favorite"

                android:padding="16dp"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:background="?attr/selectableItemBackgroundBorderless"

                android:contentDescription="@string/menu_favorite"

                android:padding="@dimen/spacer_2x"

                tools:src="@drawable/ic_star_yellow_24dp" />

            <androidx.appcompat.widget.AppCompatImageView