Merge "Change the column number from 2 to 3 in Portrait favorites on Volantis" into lmp-dev