OK, so I noticed my editviewdefs.php in my /custom/modules/leads/metadata folder was way different than the one in /modules/leads/metadata folder (and not just the fields customizations). So, I deleted both the detailviewdefs.php and editviewdefs.php in the custom/modules/leads/metadata. Then went back into Studio, checked, sync to detailview, and re-saved the editview layout. This created the two new viewdefs in the /custom/modules/leads/metadata folder and voila, now it works.
Not sure what happened, I had this from beta so maybe in the upgrades there was some snafu. Anyway working. Try this if it happens to you.