Merge "Re-order contact edit KEYS and state save/restore to match member order"