Merge commit '5609558c02b39ed50e44767f472c440f36eeef8e' * commit '5609558c02b39ed50e44767f472c440f36eeef8e': divide mRestoredScale before use
Merge commit '5609558c02b39ed50e44767f472c440f36eeef8e' * commit '5609558c02b39ed50e44767f472c440f36eeef8e': divide mRestoredScale before use