Navigation - Partial State Saving Issue