Merge "Remove screen layout references in passwordreset-email* messages"