Merge "Removed unnecessary xd->mode_info_context assignment"