Merge "[scroller] change bottom bounce time <CQ : H0100135349>"