Merge "Fix RemoteViews.java style." into main