*) Mild cleanup of DEV_FORCE_SHOW_NAVBAR in the process. Change-Id: I519245ffb350c172bb1eef2b0d507089fc87907c