Merge "Rendering fixes for assist handles." into qt-dev