Merge "IMF: Avoid config changes when resetting IMEs in IMMS" into udc-dev