Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev