Merge "Show nav bar on secondary displays regardless of" into sc-v2-dev