Add option to display navbar (2/2)

Change-Id: I7aabc5983dea0811dbfb4a8c79072565357a2dbf
Merge "Add option to display navbar (2/2)" into cm-10.1