Merge "Don't store lockout deadline in lockSettings" into pi-dev