Merge "Run unlock animation when device is already unlocked" into tm-dev