Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2