Merge "Add debug logging for media view events" into tm-dev