Merge "Update FMQ pointer corruption diagnostics to use a handler" into main