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

Change-Id: Ic5e5a2ee00d5eecc63efa649975d527214256ad9