Merge "Fixing preference dialog management in contacts"