Merge "Fix crash when clearing preference screen" into nyc-dev