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

This reverts commit bf8cfbe37baad7fc48a7a1c4b1c26f2a68fcddae.
Rebase from 'upstream'
Trimmed the branch to only the grizzly_desktop sub directory