Bug 1048865 - Sync with upstream TwoWayView (r=mcomella)