Merge pull request #6752 from andyque/refactorLayout

refactor Layout
add release note
Merge pull request #6826 from andyque/addReleaseNotes

modify 3.1rc0 release note