Fix action bar support on 2.x devices (continued)