Merge "Unify the design of add icon in setting" am: bc9731a575 am: 398eca1067
am: 36b2de22cf

Change-Id: I5d139de04c1cfd02f339ab947e0708b8d6c4a31f