Properly inline help icon for form checkboxes

Change-Id: Ic0ac55a9fa9490d7e872a3cbe6127e8e1112d3ae
Closes-Bug: #1349622
Merge "Properly inline help icon for form checkboxes"