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

Change-Id: Ia81037cdf9e969960029ebe42aed26a769600920