Merge "Use 4 columns in QS portrait"