Merge commit '5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken * commit '5af7ef60277060b94604a0b9679bb08a4dc1e731': Fix bug 2562240 and clean up scrollbar behavior
Merge commit '5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken * commit '5af7ef60277060b94604a0b9679bb08a4dc1e731': Fix bug 2562240 and clean up scrollbar behavior