Merge "setBoundsChangeTransaction: Fix two issues" into rvc-dev