Merge "Add individual try/catch blocks for ParcelFileDescriptor closure" into main