Merge "Revert "Add betterbug folder to gs-common"" into 24D1-dev