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

Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455