Merge "display:config: Enable composer 2.2"