Merge "Fix QS notification scrim clipping being affected by offset" into main