Merge "Allow finish resize transaction to be overriden" into rvc-dev