Merge "vp9: Modify logic for gf setting based on up-coming key frame."