am c3661b16: am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev

* commit 'c3661b169876bf094f09f69f40349b598bf3a745':
  Fix bug in Scene's use of setTag