Fix Cancel buttons in Custom Property dialogs

This submit adds borders to the Cancel buttons of the Create Custom
Property and the Edit Custom Property dialogs.

Change-Id: I02f8f6032db5ba81c10f9073e6981f6fba87dfdd
Partial-Bug: #1364644
Merge "Fix Cancel buttons in Custom Property dialogs"