am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30
automerge: 31deee5

* commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c':
  Stop crypto UI from crashing during encryption