Merge "Fix bug in Scene's use of setTag" into klp-dev