Merge "Adjusted chooser padding so 2nd line isn't cutoff." into oc-mr1-dev