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: 0f1f4f06bc

Change-Id: I05bd40e454f4fd75457cba09d456491a4681233d