Merge "WindowManager ProtoLog feature"