Merge "Add window_frames_valid to proto" into tm-dev