Merge "FM Radio: Wait for disable to complete" into fm.lnx.2.1-dev