Merge "Fix scrim animation when unlocking with fp" into pi-dev