Merge "Preserve Spinner widget open state across instance save/restore"