Modify relative layout
Merge branch 'master' into master_nutty_modify_layout
Merge pull request #4270 from nutty898/master_nutty_modify_relativelayout

[ci skip]Master nutty modify relativelayout