Merge "ion: ion_system_heap: Fix null pointer dereference"