Merge "FP2-346: Contact won't saved after rebooting while editing it." into fp2-dev-v2