Merge "Merge "Adjustments to handles visuals and behavior" into qt-dev am: 6d8b5483 am: b5d3c0a6 am: 9c491a1d"