Merge "Fix NavButtonLayoutFactoryTest init dependency to turn on enableTaskbarNavbarUnification" into main