Merge "Ensure that stack view exists when applyUpdate" into rvc-dev