This is preparing for nested popups inside the master popup. Change-Id: I3bb86acd1bf841d5b27018565f5aa8f4a3295d9d