am 48242d80: am 50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window"

* commit '48242d801c8719f458a615b14b31760ae590006e':
  [HWUI] Fix invisible views are still shown in popup window