Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558' * commit '0221ec55ac57f32a42fb1e7b66779ca955d58558': Control H icon display in Status bar. Fixes #2175599. Prevents an NPE when AttachInfo is null. Set the Bond State to NONE when we receive a Agent Cancel. Make vCard import Photo from vCard file :(