Merge "Extract credential storage dialogs to a new activity." into honeycomb