Merge "Replace drag and drop mouse pointer shape" into nyc-dev
am: 99a3ee1

* commit '99a3ee13f4ba3e400709737a49c94d56b7f61e9f':
  Replace drag and drop mouse pointer shape

Change-Id: I8f273281afcd87d7fb17ad4a0c06e317d1f31728