Merge "Don't crash TileService app when systemui crashes" into tm-dev