Merge "Fix scrim animation when unlocking with fp" into pi-dev
am: 4f4d78b877

Change-Id: I71f9c9966f161afe179a24628935097174d9ca21