Merge "If 'customTokens', let authenticator handle notification." into honeycomb