Merge "Remove user icon avatar from memory when unlocked" into tm-dev