Merge "[Status Bar] Append "__external" to external icons." into tm-qpr-dev