Merge "Fix bug 5105394 - Get rid of btn_default_small"