Merge "Fix pin icon un-allignment on direct share row" into tm-dev