Merge "Fix NavButtonLayoutFactoryTest setup to turn on enableTaskbarNavbarUnification" into main