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

Change-Id: I5bf02f104479aba4e1dc199c07077cff5afdffc2