Merge "Fix wait time for audio threads in suspend mode" into oc-dev