Merge "Fix crash due to modifying immutable PersistableBundle"