Merge "Remove the /dev/.booting file before triggering boot."