Merge "TIF: Make TV content rating names consistent" into lmp-dev