Revert "Track CMs Camera & Gallery2"

This reverts commit fc5f110920e7b83ffe16182d6561fd99b8747e56.