Split UnwatchAction into own class

Change-Id: Ief650c115237214345bef7733d33967f0e042521