Merge "Fix Ogg album art" into mnc-dev