am b0ebbd00: Merge "fix quick control rendering" into honeycomb-mr1

* commit 'b0ebbd0058d62a6e76ef7ae66cbe0297be38425e':
  fix quick control rendering