Merge "Fix issue with extra padding int groups list view." into klp-dev