Better mode selection was implemented for all content.

Change-Id: I479778ed21d3968892f4dce396c83733583f4f23