Merge "Fix issue where video does not un-pause after call waiting dismissed." into nyc-dev am: 9ae9630e9c
am: de54e21caf

* commit 'de54e21cafdf72fc5a4c4ac6e30d03294d096c1f':
  Fix issue where video does not un-pause after call waiting dismissed.