Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2