Merge "refactoring "All Apps" layout into one layout"