Merge "Adjust the margin of Help text in Setting" into 2.0_beta