am 72191950: am 6b1cb352: Fix issue #2149126: unable to answer incoming call, various problems

Merge commit '7219195066f365ae4ada788dd416e5e87fc906f5'

* commit '7219195066f365ae4ada788dd416e5e87fc906f5':
  Fix issue #2149126: unable to answer incoming call, various problems