Merge "Remove extra button bar." into honeycomb