This cl changes the order of adding nav button to contrianer, so upon user rotating phone to landscape more while in RTL will not cause buttons to switch positions. Test: Manual Bug: 396135895 Flag: EXEMPT bugfix Change-Id: If5512cbdac06bc65f10c8d1e326ae6b786de98ba