Merge "Home Controls: Add max columns for edit activity." into tm-dev