Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev