Merge "Fix WindowManager proto for activityRecord level unification"