Merge commit '71836f4cb6389042d839d2a26582f796c6e97c26' into kraken * commit '71836f4cb6389042d839d2a26582f796c6e97c26': Remove scroll barrier constant.