Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev