Merge "Remove icons for setting items in app & notification screen" into oc-dev
am: 25b6ef1604

Change-Id: Idc68e9a24390842ca8232e2215a0173a33b84e2a