Merge "fix density sample to state density type rather than screen size" into honeycomb