Merge "Ensure staged rollback status is logged on boot" into rvc-dev