Merge "New unlock animations" into qt-r1-dev am: ce25bd2f09
am: 1b4e8d2f3c

Change-Id: I09790a50a4cc393d9702b1c0124cf8525a11102c