Merge "Add compat info to WindowManager proto dump" into sc-dev