Merge `release/4.7` to develop

@jleandroperez would you mind taking a look at `WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m`?