Merge "Handle apexd failures" into main