Prepare for multiple Google+ identities support