tree c2dc69c43be9eb73fc0f13db0906138e3300f43b
parent 45451eaf6098c579d6ccba67652812f48acca98b
author Marcus Hagerott <mhagerott@google.com> 1477503988 -0700
committer Marcus Hagerott <mhagerott@google.com> 1477505044 -0700

Stop switching to main contacts list unnecessarily.

Test
Manual: follow repro steps from each bug and verify expected behavior occurs

Bug 31838582
Bug 31829161
Bug 32068858
Bug 32379067
Bug 32377019
Bug 32339019

Change-Id: Ie2760ed144854f8c6e57b6b7ba7353864180c2e7