Merge "Increase char limit of keyguard messages" into pi-dev