Merge "Force FilterClient to NOT reset the FMQ pointer when creating the MQ" into sc-dev