DF-4960 - android textfield fix.
DF-4960 - review comments.
Merge remote-tracking branch 'to_master' into DF-4960-android_textfield_fix
Merge branch 'DF-4960-android_textfield_fix'