Merge "Avoid static protolog dep in WindowManager-Shell"