Merge "fix quick control rendering" into honeycomb-mr1