Merge \\\"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\\\" into nyc-dev am: 4455fc734c am: 81f69753ed
am: 202d7a4f48

Change-Id: Id1cb31d3ad2d8fe1f1e8c0c89ae27275c799e550