Merge changes I995a059c,Ibf78c90b into udc-qpr-dev

* changes:
  chore(#MagSettingsPanel): change persisting scale timing
  chore(#MagSettingsPanel): make seekbar index reflect the controlling magnifier scale