Add better support for preferred content size changes.