Merge "Set max 2 lines for buttons shown in AddItemActivity" into sc-v2-dev