Merge commit '750edffbc0fe528b93097f9ce909f446540cfff5' into kraken * commit '750edffbc0fe528b93097f9ce909f446540cfff5': Make desk mode work again.
Merge commit '750edffbc0fe528b93097f9ce909f446540cfff5' into kraken * commit '750edffbc0fe528b93097f9ce909f446540cfff5': Make desk mode work again.