Merge "Set EditText height to wrap content in EditUserInfoDialog" into main