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

Change-Id: I2b61ce54d42be0648f7d53e2a7e659da2c9c00d7