I think this problem is in Desktop code. Also, we could land this pull request in production without breaking or bothering anyone, since they are new, un-used paths. I'm fine with either landing hard coded settings here or removing them.