Merge "Longer bouncer delay and simpler delay logic" into qt-r1-dev
am: 9ce46b641a

Change-Id: Ie9221176a91af01071c5e3b91b8eaecae8d2bfc6