Merge "Remove LayoutInflater delegate support for compiled views" into main