<DA-289-ios> remove unused code
<DA-289-ios> fix double event invocation
<unstable> Merge branch 'DA-289-ios' into unstable