Revert "Make SBAU optional"

This reverts commit 4de6885d502355e6b6856512593b00278954a575.
Settings: Fix text box margin to proper gap

Fixes a long time layout glitch

Change-Id: Iba9ed2f996a3fd3222fa2a1ea0da86d6a775fd1a