Merge "Notify the media scanner" into klp-dev