Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev