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

Change-Id: If2f17730179bb43ca6d7e5f32125b3fbdcaccd54