[DF-4977] Fix dialog scrolling when one taps on the text field
Merge remote-tracking branch 'origin/to_master' into DF-4977_Android_dialog_scroll
Merge remote-tracking branch 'origin/to_master' into DF-4977_Android_dialog_scroll
Merge remote-tracking branch 'origin/DF-4977_Android_dialog_scroll' into to_master