Merge "Revert "Show even dimmer upgrade dialog on QS"" into main