Merge "centralised password entry field in lockscreen" into main