Avoid running 2 radio commands in parallel in the same channel
Merge branch 'cm-10.2' into martincz