Now that the first point release of the 20.2 mesa branch is here, I think it could be a good idea to update it in master and 20.08 branches of freedesktop-sdk, instead of the currently used 20.1.x version. :-)
edit: [Mesa-dev] [ANNOUNCE] mesa 20.2.2