Buttons in toolbar didn't shift correctly when primary wasn't visible

Made it so that both secondary and primary buttons are in a linear
layout and automatically shift when needed.

Test: Made and flashed, ensured buttons end up in right position.
Change-Id: I85e3ddebd0503a8f3682cd1fc3baa320640bfa29
Fixes: 70523454