Arthur and me worked to tweak the integration

Arthur tested it too on Samsung Galaxy 3.
It is ready for extensive testing before submission