Merge "Fix scrolling of QS panel when no notification is present."