Merge "Rewrite MediaStore thumbnail internals."