Merge "Simplifying pending widget inflation path" into main