Merge "Fix mediaOffset for QQS flexiglass" into main