Merge "Skip auto sign-in if the user is already logged in." into honeycomb