Merge "Fix clipping on scrolling QS Panel"