Merge branch 'master' into design_merge
Merge branch 'master' into design_merge
Cosmetic tweaks

Fix background color clip on avatars, style timestamp
Merge branch 'design_merge'