Merge "Better diagnosing when Launcher settings popup is visible" into main