Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am: f104b68a04

Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f