Merge "Ensure we get the right nav bar mode for the current user in sysui" into qt-dev
am: 05500a3651

Change-Id: Id98dba16b731eb62ee5b6e85075733a98092bc85