Merge "Rendering fixes for assist handles." into qt-dev
am: 075baa2e9b

Change-Id: Id4d60a85fba3ba08516aada382285fc48ce89cdc