data-binding: ensured passing a proxy to setModel can't cause binding failures
Merge branch '2.4'