Merge pull request #5339 from mahdihijazi/fix_edit_controls_layout [Android] Fix edit controls layout
