Merge "Prevent counting items more than once during multi-select." into arc-apps
am: cb60057b23

Change-Id: Iefea803239bbb4ee0a346232fca7d290893888fa