Merge "Fix missingcommenttext message to be more useful in different page layouts"