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