Merge ""turn off APM to make a call" message pop-up even when APM off" into rvc-dev