Merge "Refactor force visible nav bar into new secure setting." into tm-dev