Merge "Use the correct item layout for android:entries" into mnc-ub-dev