Merge "Add logging for media controls" into tm-dev