CON-1016 | Fix for Android