Settings: Fix text box margin to proper gap

Fixes a long time layout glitch

Change-Id: Iba9ed2f996a3fd3222fa2a1ea0da86d6a775fd1a
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2