Merge "save "retain loader" state" into mnc-dr-dev