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