Merge "Use the correct intent variable for computing result caller info" into main