Merge "Don't update the genID for an immutable bitmap" into rvc-dev