Revert "Merge branch 'master' into dev_group_chat" [Outgrade submodule]

This reverts commit e1fe6a61, reversing
changes made to 5bfbd6e6.
2 jobs for master
in 0 seconds and was queued for 0 seconds