Use the same branch for Desktop and GeckoView

When we had Android on Rapid Release, we needed to use different branches for Desktop (based on ESR) and for GeckoView.

Now that we are basing Android on ESR we could use the same branch for both.