am 292694aa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '292694aa0171ec032e9abb08f09b82319e27044d':
  Workaround for generating QSB icon press states. (Bug 7132477)
  Adding more debug code for dup. ItemInfo bug