Merge "Prevent system reset staged installer bypass flag unexpactly" into rvc-dev