Merge "Fixed lockscreen pattern size." into tm-dev