Merge "Implemented disambig dialog for new speed dial fragment." am: 827cdbc7d8
am: 932b9e2864

Change-Id: I32c1fa70734e18a98090261bb6de4eea1de96b8e