Merge "Avoid concurrent modification for pending partial layout views"