Merge "Do not play "lock" anim right after showing kg" into qt-r1-dev