Merge branch 'fix/loading-apps-screen' of github.com:RocketChat/Rocket.Chat into fix/loading-apps-screen