am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb

* commit '62c9b6cb1479c24e07bc81b61b77905d13998b41':
  fix density sample to state density type rather than screen size