Merge "Fix TaskbarNavButtonControllerTest failure" into main