Merge "Disable APF memory clear on pre-APFv4 devices" into pi-dev