Merge "Set correct bounds when offset and expanded" into rvc-dev