Merge "Increase credman max visible dropdown credentials to 4" into main