Merge "Restored the appearing behavior of media hosts" into tm-qpr-dev