Merge "Preserve previous control parameters with common AIDL parameter setting" into main