Merge "Improve workspace's scrolling performance." into froyo