Merge "Updated Strings to finalized version and refactored string names to be...

Merge "Updated Strings to finalized version and refactored string names to be more consistent with the feature and fixed disablement of USB during bootup." into main