Merge "Check hasNavigationBar when showing IME nav bar" into main