Merge "Don't let preferences change size on load" into mnc-dev