Merge "Fix get user profile icon issue"