Settings labels vertical alignment fix

Change-Id: I18a61512e2057ebd9768174f73167f6ac4ad7692
Merge "Settings labels vertical alignment fix"