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

Change-Id: I8034ad1feca8895fef2d0238dcce755179d261ec