Merge "Update strings (for media permissions)" into tm-dev