Just a heads up for when we there will be a FW with MTP switch: make a FULL backup just in case
I was playing around recently, jumping from 5.16.2 (non-MTP) to 5.16.9 (MTP) on Kindle Scribe and it wiped all user storage in the process.
I don't know whether this is intended, so just make a backup.