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

This reverts commit b1d8c1a85fb77c4665745f91623cc1bbedfadced.