Merge "Increase keyguard password maxlength to 500" into rvc-qpr-dev