Merge "Add dumpstate HAL APEX" into main