Merge "Complete [add|remove]OnSessionTokensChangedListener"