ODK Collect v1.23 should address this issue! Please try it out and let us know if you run into any other issues.