Merge changes from topic "update-ims-hold-logic"

* changes:
  Cleanup and refactor IMS hold logic
  Add extra line to avoid merge conflict