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

Change-Id: Iad78613119f266f9f15f115f4ff92ed57bee2c18