Merge "Handle parceled usage events more friendly." into main