Merge pull request #18353 from surajshetty3416/refactor-call-popup

fix(call popup): Multiple changes