Merge "Fix NPE in AppWidgetServiceImpl#maskWidgetsViewsLocked" into main