Merge change I89190b8b into eclair

* changes:
  New photo frame in LARGE QuickCotnact window