Merge "Update paint filer when updating thumbnail"