Merge "Further CQ, Key frame and ARF changes"