60302f1938
automerge: 31deee5 * commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c': Stop crypto UI from crashing during encryption