Merge "Send LOCKED_BOOT_COMPLETED on same queue as BOOT_COMPLETED"