Merge "Fix lockscreen not bouncing up when face auth is running or locked out" into tm-qpr-dev