Merge "recovery: fix denials during factory reset"