Remove the temporary click handler once the final one is installed

Change-Id: I166ab85e358c74db486709ca062897c8cf541cfa
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/391
Merge "Remove the temporary click handler once the final one is installed"