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

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