Merge "Show drag handles after finishing batch edit if needed." into nyc-dev
am: be1cd9f5ce

* commit 'be1cd9f5ce6eb2bc37b15258c6ab22e2fc5592e1':
  Show drag handles after finishing batch edit if needed.

Change-Id: Ie831efddf37c32c003936d5214d30f7d59878fb8