Merge "Use quick_qs_total_height when QS is not disabled"