Merge "Workaround static fast track start-after-stop issue" into mnc-dr-dev