automerge: 0e6178b
* commit '0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
Stop crypto UI from crashing during encryption
automerge: 0e6178b
* commit '0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
Stop crypto UI from crashing during encryption