Merge "Ensure token refresh. Fixes bug 1044316."