Merge "Restore Quick affordance interactor test" into main