Merge "Adjustments to handles visuals and behavior" into qt-dev