Merge "Fixed popup assets (background)" into gingerbread