Merge "Increase char limit for private space set screen lock message" into main