Merge branch 'upstrem-button-action' of https://github.com/Shailesh351/Rocket.Chat.Android into Shailesh351-upstrem-button-action