Merge "Restore bitmap mutability across parceling"