Merge "Reduces Assist Handle fade out duration" into qt-dev
am: 0972aa6a60

Change-Id: I68bb45ff82f84d81e273d893a71b5fa5cf4b91c7