Merge changes Iefdc2d0e,Ibccc610c

* changes:
  Let InCallPresenter instead of StatusBarNotifier implement AudioModeListener.
  Clear cached requested video state