Merge "Adjustments to handles visuals and behavior" into qt-dev am: 6d8b548380
am: 7cde101c0c

Change-Id: I8b716610b26c6919bcdeb7298de0b4990ae8b60b