Merge "Handle setDataSource failures properly. #5261671"