Merge "Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a13 am: 1410238143 am: 6e0221d535" into rvc-qpr-dev-plus-aosp