Follow-up to #935592: User picture is deleted after calls to user_save()
Problem/Motivation
User pictures are are not saving
user_save() doesn't save the picture when an $edit is passed.
Proposed resolution
Limit the solution in #935592 to only when no $edit is passed.
Tests should be added for $edit, however $edit is going away in D8.