layouts: rename _pack_layout in _state_save_layout for clarity (+ blank removal)