Revert "Fix heads up action bar switch handling for tablets."

This reverts commit 39bb846fe01c557e162ff26804b37612855ef325.