Merge "Renamed OneTimeListener to OneActionThenDestroyListener."