Merge "Push existing pending state when deferring transaction" into pi-dev