HOTFIX: DDBNEXT-950 Android bug