Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev