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

Change-Id: I2c49fd1c8b082c8154d706ef328a032d38af9be4