Merge "ResolverActivity and IntentForwarderActivity refreshes token" into main