am ca1d18ef: Merge "Prevent NPE when shrinking workspace" into honeycomb

* commit 'ca1d18ef1c7d96627df88e17d3225f15326b1a4e':
  Prevent NPE when shrinking workspace