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

Change-Id: I610f010494d5fa56e458968036aff594969414ca