Merge "AIDL effect: Stop subeffects before closing" into main