Merge "Make avatar image only visible after it has been successfully loaded"