Merge "Change for adding QP settings for key frames"