Use updateButtonLayoutSpacing() for all states

* During a merge conflict we prevented
updateButtonLayoutSpacing() from running if device was
in setup mode, however the code that does setup layout
is in there.

Fixes: 254589281
Test: Went through setup, back button shows up
where expected

Change-Id: Ib496bfc0e3ac9023a9fc5071867c3779721ab8ab