Merge "Don't move non-modal popups in response to global layout"