Merge "Delay disk inserted broadcast until disk is ready"