Merge "Reduce padding around text in chooser grid." into udc-dev