2019 TRDP will include both moonroof and the JBL audio according to TFL. They drove a pre-production model in a Toyota sponsored event over Imogene pass and posted the video this AM. Mentions moonroof and JBL about 6 minutes in:
https://www.youtube.com/watch?v=dypF89SNoOk&t=0s
