Bug 1022646 - [Haida][Contacts] Form view separated [WIP PATCH]

OMG, I probably just missed one of the first commits there while cherry-picking for rebase, shame on me!