Merge "msm: ipa3: add a lock for active client logging"