Merge "Update phone gesture nav test in NavButtonLayoutFactoryTest" into main