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

Change-Id: I41fbd9c87b360f7d4fd049cb313856bceeff0dee