Merge "Fix the lockscreen height recalculation on face auth." into tm-dev