Fix how rpInfo is created in native Desktop authentication flow

* Remove useless #NATIVE
* Parse rpInfo from query string parameters
* Fix navigator.mozId breakage from merging Desktop to hg tip
Merge pull request #4023 from mozilla/fix-rpInfo

Fix how rpInfo is created in native Desktop authentication flow