Merge "Don't use a copy of window params when showing a dialog." into pi-dev
am: 3f6b7714a7

Change-Id: Iaacd371fb0c63eedaab73f32314c14997e578462