Merge "CallLogManager & TestApp updates given business composer changes" into main