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

Change-Id: Ic213c4c42d696c59286d8b7dfc94602c81520dbe