Merge "Move the boot_completed FGS check" into main