Merge "Restore user picture in add user dialog on rotation" into main