Merge \\\"Fix crash when an app with an active quicksettings tile is updated...
Merge \\\"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\\\" into nyc-dev am: 4455fc73 am: 0f1f4f06
am: cf1cc352
Change-Id: I5ae1ec9920753d46967268330f74f91c665e61e1