Fixed z-index on popup

Bug: 61023
Change-Id: I0cef89493012d6e3c0196a38828711df55b22d4e
Merge "Fixed z-index on popup"