Merge pull request #8845 from Ebola16/DISC2 Android: Display disc number instead of company if mulipart disc
