Merge changes from topic "am-529fc7c817b345d8a5cd53ebbf919012" into udc-qpr-dev-plus-aosp
* changes:
Merge changes I995a059c,Ibf78c90b into udc-qpr-dev am: fc7d9f4b
chore(#MagSettingsPanel): make seekbar index reflect the controlling magnifier scale am: 96261a53