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

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