Improve media scanning, smart wait on rescan