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