Merge "Update APF disassembler for program type detection" into main