Limit cases when contact's status and avatar are updated (#7002)#7123

iequidoo wants to merge 2 commits intomainchatmail/core:mainfrom

iequidoo/self-statuschatmail/core:iequidoo/self-statusCopy head branch name to clipboard