Merge "APM: Allow VOIP_TX input selection" into oc-dr1-dev