2016 Tacoma JBL Entune to a 2020 JBL CarPlay?

Does anyone know if this is just plug and play or is the harness different between the years? Also is there anything else that is needed to stick with the OEM swap? I am about to buy the OEM CarPlay for the 2020+ models and didn’t want to rip apart the dash to find out I need a different harness or other items.

 

So bought the head unit as autoharnesshouse.com says they can make a wiring harness to make it work. The only other thing I am told that needs to be replaced is the amp as the older JBL amp is not compatible with the new head unit. Mostly just wanted the OEM CarPlay, so I don’t have to run Waze on my phone instead of using and upgrading the factory navigation sd card.
Anyone else swapped old JBL for the new JBL?

 

I know this post is old but what became of this? I've also got a 2016 with JBL audio and would prefer some OEM CarPlay over an aftermarket solution.