Revert "Trimmed the branch to only the rosh_desktop sub directory"

This reverts commit db767370abff08bde58720a24913e92fa8052377.
Rebase from 'upstream'
Trimmed the branch to only the rosh_desktop sub directory