Merge "Fix key frames in headers animation" into tm-qpr-dev