Merge "Fixes BinderTests when enable shell transition."