Mediascanner: make sure cursor is closed

Change-Id: Iff2948f7fb0fe7080f283eb5ec79073032525540
Merge "Mediascanner: make sure cursor is closed" into kk44