Merge "Fix the size of Add button to 328dp" into sc-mainline-prod