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