Merge "Migrate away from @hidden onViewAdded."