Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev
am: 090e9d232c

Change-Id: Ifdd605c54262b533b405a6161b7b857609d576bc