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

Change-Id: Ib8cd122a55960e32dc856853728661337d0e1d00