Merge "Set PredictedAppIcon ring disabled when icon is disabled" into tm-qpr-dev