Merge "Update foreground calls with child-parent call changes." into lmp-dev