Fix navigation bar order in seascape

This reverts the revert in commit c44368016a192dfe381f5f73c07be42e705e64db,
thus reapplying 27315acfbbf9921e760647e2e96e74ec7de6015a.

Also fixes the bug that was the reason this needed to be reverted and
fixes a case where the order was not correctly updated (landscape to
seascape or vice versa)

Fixes: 29612635
Change-Id: Id51cf7edaeeea16cba08bcd5a30313f58fa00d4d
4 files changed