Merge "Fix dividers position for LinearLayout"