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

Change-Id: I0e9db19ce802b33cab574881d62f0558a8ad91f3