[DF-1516] update android textfield delegate logic.
Merge branch 'to_master' into feature-testing