Merge changes from new upstream beta version 11.1b:
 - Small change to stop accumulating counts while in the setup menu.