Merge "Adjust PhoneMediaDevice icons and (sub)titles (TV)" into main