Merge "Allow fabricated RROs to survive a reboot in non-user builds" into main