Merge "Improve the falsing logic for unlock motion"