Merge "Fix the file names of the RemoteViews resources." into main