Merge "Revert "Load direct-share icons asynchronously"" into tm-qpr-dev