Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp * commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e': Make desk mode work again.
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp * commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e': Make desk mode work again.