am 51501aa8: (-s ours) am b74941e3: Merge "Fixed popup assets (background)" into gingerbread

Merge commit '51501aa8703c15c6156ba14774f3ff41cde31700'

* commit '51501aa8703c15c6156ba14774f3ff41cde31700':
  Fixed popup assets (background)