Merge "Extract out common adapter logic to support different AllApps layouts" into tm-dev