Merge "Refactor BackNavControllerTests to use WindowStateBuilder" into main