Merge "Refactor the way RemoteViews-generated views are set on the Row" into main