Merge "Fix ShadeBackActionInteractorImplTest" into main