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

Change-Id: I291ec343b9c774449203c1c519e9685fbc19c552