Merge "Fix QSTileImpl NPE on startup." into pi-dev am: a501257ea2
am: 61d73d5246

Change-Id: I386fbf713cc10b47d5d74e962c02d52239056fd7