Merge "Switch to using system-wide default user icons" into lmp-dev