Merge "monkey: trap SIGHUP in shell before launching"