Hi there,
I can fix this issue for you on the Android side but the available fix (android side) is only available from API level 21 onwards as this functionality was only added to android with that API level.
I can send you the code to fix this ASAP,
Laura