Merge "Update Picture-In-Picture TV to use ProtoLog instead of Log." into tm-dev