Merge "Update style of build number string" into sc-dev