Merge ""Guest" icon should be a default user icon." into pi-dev