Merge "Refactor save_context restore_context in rd_pick_partition." into nextgenv2