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

* commit 'd9f3dac3492245a8c4aff111c7ce9e3800d7c316':
  Prevent NPE when shrinking workspace