Merge Settings: refactor TRDS toggle and add some apps