Revert "Revert "Remove 'force overflow button' logic.""

This reverts commit 9ee24f3e0664244e3ddb6eafb861086fcb963b06.