FP2-1010: Merge upstream MyContactsWidget

Update MyContactsWidget with latest upstream code.

Change-Id: I3a5d4b174242e8feedd11ca6bd2d57554e4cf562
69 files changed