Merge "fix quickcontrols" into honeycomb