Merge "Revive the qs shortcut setting's restoration that was accidentally removed by merging from 24D1 to main" into main