Merge "Revert "Revert "Complete [add|remove]OnSessionTokensChangedListener"""