Merge "Revert "Remove adapter access from layout manager"" into klp-modular-dev