Merge "Fix add user's dialog background by using padding instead of margins"