Merge "Get rid of the recovery dialog"