Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2