Merge "Finalize VDM Demo compatibility with Android 14." into main