Fix caption listener leak and caption measurement (#13741)

Reverting the previous fix to caption measurement, it caused a leak with
the listeners.
Change-Id: If1c06db692c0e829d91528eceb49a9a07f58ed4a