Merge "FP won't wake device if daemon dies" into oc-dev