Merge "add pixel_state_saver to mapper list" into main