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

Change-Id: I7efc491a0b9fda7e13b5812e9746147e6bb6af29