Merge branch 'develop-2.x' of https://github.com/RocketChat/Rocket.Chat.Android into improvement/layout
