Merge "Longer bouncer delay and simpler delay logic" into qt-r1-dev