Merge "Use stable item ID instead of URI for checkedItem"