Merge "Support defining X column layout for all apps as a display option." into ub-launcher3-qt-future-dev
am: 315732e524

Change-Id: I1c47d689fbec052859d5fdbfcf8d10b07ddd0202