Merge "Fix timing race condition in toggling ProtoLog to logcat" into main