Fix double width border between toolbar and surface in dialog.

Change-Id: I647a5f4c37d543e8a7c90eecf8cbe3a7a856cc47
Merge "Fix double width border between toolbar and surface in dialog."