Merge "Add Reboot Escrow feature flag"