Merge "Disable optimize startInput in IMMS" into pi-dev