Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into project/remove-author-tag-on-doc-comments