Cleaned up code, fixed contact avatar blinking when toggling selection in list while creating chat room/conference
