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

Change-Id: Ieb3ab5993e72d2376f91b164b08af708a86fc1e5