Merge commit 'cf2c68c9c21b8af62e95374312355d22ed55e586' * commit 'cf2c68c9c21b8af62e95374312355d22ed55e586': Avoid unnecessary SharedPrefences disk writes.
Merge commit 'cf2c68c9c21b8af62e95374312355d22ed55e586' * commit 'cf2c68c9c21b8af62e95374312355d22ed55e586': Avoid unnecessary SharedPrefences disk writes.