Hey guys! Yes, we can mitigate this issue on our end. Next builds of our iOS and Android apps will handle this scenario. I expect both updates to be available next week.