Merge "Fix showing a cut off notification when QS is expanded" into pi-dev