Merge "Increase number of QS columns from 2 to 3 on landscape tablets"