Merge "Prevent NPE when shrinking workspace" into honeycomb