Fixed ChangeBounds matching against the wrong View.

ChangeBounds must ensure that its parents match to use reparent,
but it used instance and ID matching. Matching can now be
done in several ways and that is insufficient.

Change-Id: Ic0432cd06549e4dc9ba49f33b0a6a42082e29dc1