Merge "Fix critical sonar issues in messagerouter/mirroragent"