Merge "Layout refinement for app lists" into mnc-dev