Merge "Fix settings icon row consuming the click when tapping the notification" into nyc-dev