Bug 836170 - [Contact]: Scrolling and Dragging in contact application is very slow

Fixed all unit tests and problems detected on the unit tests as well.

Rebased and conflicts solved with current master