Merge "Add a null check for getWindow()" am: 3c69948e6a am: 71f52a6a0d
am: bee3e01c9b

Change-Id: Iee9698396354eb0e0cacff759cc0dcef621ff514