Merge "Hide QS shade when triggering ExtraDim migration dialog" into main