Merge "Don't create new nav bar layer when IME is rendering nav buttons"