Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev
am: ca53cf7f9a

Change-Id: I5b324408048abe4977cd84767c8f034e4ccc56a9