Merge "Increase PromiseIconUiTest timeout temporarily" into tm-dev