Fix leak.

Change-Id: I44ddb93faf1129d938ca199bc8d040028f18b141
Merge topic 'fix-custom-view-button-leak' into next

db4783b Fix leak.