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

Change-Id: I70745ec3a17beceb78b2b408bff308a6b7aa9dd2