am 6490e80e: Merge "save "retain loader" state" into mnc-dr-dev

* commit '6490e80e17df878db3704b3b677a2ab92b0f7dc9':
  save "retain loader" state