Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev