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

Change-Id: I3f5e4eb86d8a14393a853669a401090046a31da3