Merge "Revert "Restore the account using SetupData after rotating the screen.""