Merge changes from topic "presubmit-am-eef876b2f2b74ea88f9600c9f6303507"
* changes:
[automerge] Remove user icon avatar from memory when unlocked 2p: 5bf13fa9 2p: 117c6764
[automerge] Remove user icon avatar from memory when unlocked 2p: 5bf13fa9
Remove user icon avatar from memory when unlocked