Merge changes I2974f964,I39a3adf9

* changes:
  Fix addTarget not limiting to the given views
  Backport Transition target enhancement in L