Merge "Fixup widths of clear/ delete buttons" into jb-mr1-dev