Merge "Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2a1 am: 1fc4269158" into rvc-d1-dev-plus-aosp