am 59551217: Merge "Attempt to fix crash on workspace drag and drop on certain JB devices" into ub-now-mister-ugly

* commit '59551217428a9cfbe11f727d0b69246a291931b5':
  Attempt to fix crash on workspace drag and drop on certain JB devices