Merge "Ensure QS classes use display-aware context" into main