Merge "Wrong index while dumping the print sub-system's state." into klp-dev