Merge "Added subtle animation for unlocking screen." into qt-r1-dev
am: 0ca1dbcb25

Change-Id: I08834a57295530c15d19811cccc72174f9f428ad