Merge changes I2996a151,Iee1999c6

* changes:
  Added tests for SmartDialNameMatcher.
  Allow orientation change when receiving video upgrade request in the in-call UI.