Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken * commit '2fecae386d952197d63fb75f8ec245d87159a684': Hopefully get rid of some ANRs.
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken * commit '2fecae386d952197d63fb75f8ec245d87159a684': Hopefully get rid of some ANRs.