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

Change-Id: Ie5416e6ba8c9e21f48d47f21892cee1574f3c45b