Revert "Remove 'force overflow button' logic."

This reverts commit 1121facde1ed0e0511a275078ed286e0e2e2bba9.

Conflicts:

	core/java/android/provider/Settings.java