Merge "Feedback form: tweak field spacing"