[automerger skipped] Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev am: 090e9d232c
am: 67a6e07ed3  -s ours

Change-Id: Ie751d707232446d896501a3eeb19b65fc6806ca6