Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev