master
Refine code style
Bring back semitransparent TV app via build variants (#2741)
Fix locale config not merged