Backout bug 903401 for fps regression on the contacts app
Merge pull request #12097 from vingtetun/backout-fps-regression-contacts-fixed

Backout bug 903401 for fps regression on the contacts app