Track CM koush widgets & Fix derp

Change-Id: I8b0c54cec60da1fb8e5e4a28808d38e6ecfccf75