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

* commit 'd14c0ea21d6bebd4c6882d449c896de9db5059a8':
  Fix assets and layout for popup window