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

Change-Id: I83321a143a402f0babebca140a01bdacf26feb4d