Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2