Mac - Support more robust injection process. Merged from totalfinder-osax project commit: d9da1b599b.