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

Change-Id: I102c84a691c260db264ac1e498a768bfa8771892