Merge "Always dismiss visible top associated overlay" into main