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

Change-Id: Ieae295ad277877e52399032908677c15180159d3