Merge "Fix crash in monodroid apps" into oc-dr1-dev