Merge "Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm"