am fc0fbd1f: am d213f5c9: Merge "Revert "Fix assets and layout for popup window"" into ics-mr1

* commit 'fc0fbd1fbf655f712cd7af912fe241ff708fe24c':
  Revert "Fix assets and layout for popup window"