Merge "Crop avatar in bouncer user switcher" into tm-qpr-dev