Merge "Settings: TRDS 2.0 (3/3)" into jb-mr1