Merge "Add flags for new restore icon treatment" into tm-qpr-dev