am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to...
am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev
* commit 'd3e5180f':
Prevent out of range magnification scale to be persisted.