Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev