Merge "Sort media when loaded or removed" into main