am 60302f19: am c220d8e5: Stop crypto UI from crashing during encryption...
am 60302f19: am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b8 automerge: e20dd304 automerge: 31deee5e
* commit '60302f19':
Stop crypto UI from crashing during encryption