Merge "Revert "Prevent NPE in PulseExpansionHandler"" into rvc-dev