Merge "Added subtle animation for unlocking screen." into qt-r1-dev