Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread