Merge "Delay mediaserver/mediaextractor during boot"