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