Merge "Fix NPE with null app window." into pi-dev am: ee09c4ca62
am: 6205a3bde6

Change-Id: I91cb976f0fef8ff5840e76a894f1e5e8a6f27719